projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f67d674
)
[MAC_OS] (xpm_load_image): Fill in background field
author
YAMAMOTO Mitsuharu
<mituharu@math.s.chiba-u.ac.jp>
Fri, 21 Apr 2006 07:56:33 +0000
(07:56 +0000)
committer
YAMAMOTO Mitsuharu
<mituharu@math.s.chiba-u.ac.jp>
Fri, 21 Apr 2006 07:56:33 +0000
(07:56 +0000)
while we have ximg handy.
src/image.c
patch
|
blob
|
history
diff --git
a/src/image.c
b/src/image.c
index 10c402be119ed7ec9ff43bfd302a7f86cad59507..e1962d87b0fe70b13e48d68c6161de3e5b2b85f8 100644
(file)
--- a/
src/image.c
+++ b/
src/image.c
@@
-4460,6
+4460,10
@@
xpm_load_image (f, img, contents, end)
img->width = width;
img->height = height;
+ /* Maybe fill in the background field while we have ximg handy. */
+ if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
+ IMAGE_BACKGROUND (img, f, ximg);
+
x_put_x_image (f, ximg, img->pixmap, width, height);
x_destroy_x_image (ximg);
if (have_mask)